launcher OSX compiles with Jim's big-merge. container.cpp crashes though