Added Collectable framework, will test more tomorrow