Built rileyjshaw from commit af1fc6f on branch dev