Add some extra structure and TODOs to main.c