Homework 4 almost done
Switched to enums