WIP: adding messages resource, moved events resource