Built rileyjshaw from commit d7cf269 on branch dev