callback methods built to jar

Rory's callback methods built to jar. Setup method added again,
constructors cleaned up and bug resolved.