added a bunch more todo items, so I don't forget about them;