Uncommitted changes from before
Finished moving to constants