continued on content, added a few notes in the TODOs, to be looked at