Added half complete rewrite of OSX app