Added more comments, hopefully ready for testing 1a + 1ab