Adding more objects to the design doc
Merge commit 'f8756602b6d112757aa74248b29117a227d525aa'

Conflicts:
	design.md