Adding todos so I don't forget to write tests.