TODO notes for tidying up the repo