At the moment I just want to get this working on OSX and Linux. It works so far on OSX and there are a few issues on Linux. How about I do these changes in the next branch?