Built rileyjshaw from commit 7bbb67e on branch dev