kill legacy file
interface tweak; add logging; add tests