commited basic mockup