And its working \o/

Buttons still need moving