wip on Kessler - kind of works but plenty of TODOs!