Built rileyjshaw from commit baa1f23 on branch dev