Trying to resurrect this git
Reorganized slightly.
Fixed