Design update - still a few things to do