All straightforward Mac desktop functions refactored. Functions common to several platforms are still to be refactored
Refactoring of the Mac specific functions continued - some changes previously made have been reverted as some functions are to be removed and didn't need to be exposed