Grabbable abstract base class
Code cleanup

Removed old commented stuff.
Merged master and Grabbable