Progress!

Warning, rewritten TODO so that it is readable.