Built rileyjshaw from commit b117ad6 on branch dev