Added some stuff - and a TODO list