Try to keep surface patches to a minimum for now - keep using Main.cpp
for a while longer