Working on some platform specific (ugh) stuff