Final controls
Merge branch 'TechMeeting_2' of https://github.com/InebriatedSquirrel/Seagulls into TechMeeting_2