Got all i need

YOOOOOOOOOOO, THIS IS THE BIGGEST MERGE IN ALL THE CASTLEEEEE