Coded some things for the punch task and defined stuff for the state machine.
Merge origin/master