Built rileyjshaw from commit bea539d on branch dev