Have to exorcise some bugs