Moved a bunch of stuff to constants