Kam

Merge current REST work into master
Ditto here. This should all be configured in the parent. Are both of these needed?