Just before adding final bits of functionality and cleaning up bits