Implemented Collision Buffer. Fixes #6.