Worked on guide view, some tests and tidying up code.