Endeavoru stuff

Change-Id: Ibabbbac88068af8e5d4706f704bc6323362ae4db