Add some more comments, more mockups