Fix startup project and add TODOs