Fixed rotation by reverting it to the previous rotation code.
Reverting changes so the pull can be clean, full changes are on entity-refactor
My diff keeps showing stuff which is not in my files.