Added a ton of design and table updates