Kam

Merge current REST work into master
Avoid the * imports please