Fleshing out code, new UIMockup