Moved 1.6.4 code and had a fresh start for 1.7
Tons of work on 1.7 update, work still to do