original commit with a early mockup