TODOs added, ready for a few days break from this