Built rileyjshaw from commit 7310b1e on branch dev