Placeholder additions

I've added a bunch more TODO placeholders.