Feature robot allocation

I'm not sure why so many commits are in here?!? i did a rebase against master and these were pulled in...