Refactored resting spot code

I also commented it out.  I'm not sure we need it at all any more.