Restructuting of object handling code (grasping done, putting down still being refactored)