Built rileyjshaw from commit cbc071e on branch dev