Can't have hyphens in module imports.
Mostly working now.  Well enough for my purposes anyway.