finished commenting with new mockups