fold state pattern
Revert "fold state pattern"

This reverts commit 77fe9f9e1c05379162048e2441194f3254a7307f.
Merge branch 'staging' of https://github.com/Azmisov/cs340-5horsemen.git into staging
Merge branch 'staging' of https://github.com/Azmisov/cs340-5horsemen.git into staging
Merge branch 'staging' of https://github.com/Azmisov/cs340-5horsemen.git into staging
Merge branch 'staging' of https://github.com/Azmisov/cs340-5horsemen.git into staging