Begun adding in settings, modified the default controller