Wrapped constants in enums and added lots of TODOs