Adds some TODO comments so I can remember what's left. Almost done.