Moved movement into a seperate class and added better collision(Still needs improving and adjusting as it isn't very precise)