Finalized revamped controls

Still requires code cleanup