latest changes, REST almost ready