PJ's branch of Got Robots code