Work in progress
Separated ds and object navs; added object helpers; etc.