Added TODOs and other routes