initial wireframe
fixing merge conflicts