Prepp for release

Complete re-write