Kam

Merge current REST work into master