Adding robot functionality
trying to fix merge conflicts