Basically finished the mock up