-Moved all of the constants into configurable properties