Cleaned up aiming logic to bare minimal and working up from there