Added all 2.0 (OSX app) code.