Convert mac specific code to merge branches
Fixed Errors on the config file upload for Thomas
Work down for the sugar level