Merge in legacy branch

Don't merge in changes to main.cpp.