Mock-up almost done