changing app to use enums instead of a boatload of state variables