Refactored out some constants
More refactoring of operations into isolated modules
Doo dee doo, :shipit: