Merging Garrets code and Robot code