Vaguely green with integration test hack; Not yet usable