Built rileyjshaw from commit b164ee3 on branch dev