Nearing initial release - unit tests and callbacks implemented