Actually finish changing this to use constants