Adds some designs
Fixes merge conflicts
Merge conflicts
Fixes db seed