rearranged methods to better organize and help find them
begun adding more states and actions called when those states occur