CODE: moved some stuff around
CODE: started adding unit tests
DOCS: update diary, started January review