Some cleanup, of hacky code.  Picking still not working quite right.