Update main.cpp

Clean up code that still contains the parent name.
Add TODO work all over the place