Basic design

Property changes.
Deleting this branch after this part is done.