v5 tidy

Cleaned up version of final working.  Phase 1