Built rileyjshaw from commit a8c3b1a on branch dev