Did some more work on design, for some reason