loads of design stuff
dist updated for design