TODOs were added. Unused ideas were commented out