Added some todos

Nothing of signifigance. Added some TODOs for myself later, but had to
commit to get the latest movement changes.