Implementing claw. Fixed #28