Revert "Revert "More REST""

This reverts commit 471f6a9b398db9535744dfda752012528ed9ac30.
More fixing