More cleanup, and let's use some self-referencing dep injection.
More cleanup, and let's use some self-referencing dep injection.

Also adding some configs to use later on down the road if needed (I bet sam would like them)

damianb/Quartz