Commit dump: Working on mockup.