rename default settings
WIP: make Controller a module to include
WIP: main controllers work
Got new including working and cleaning up debugging statements