Built rileyjshaw from commit ab83e3b on branch dev