Added a settings object and changed a few things around
Removed code so it won't conflict with other code