Some more work on wireframe