Some design updates (still a WIP)