Refactor state code

[NathanJesudason]

States often implement the same idea over and over, so it would be nice to look into a way to have shared functions that could be written and shared between states to keep the code more organized

[NathanJesudason]

Targeting Master v4.3, waiting for #58 before developing