Built rileyjshaw from commit e64341a on branch dev