Restructuring to be a bit saner
Updated settings