Comment the code a bit and add a TODO list