Refactored aiming code. hopefully final prototype v2