Built rileyjshaw from commit c0fd36b on branch dev