Fixing enum to work (not done!)

I started fixing the enum and other things to improve how the code
works, but am not done yet, need to make a new branch