Refactored some things and fixed major but with getPosition