Moved Settings class around, added controller