Got a start on testing
Milestone change.  Using all json and reorganized things a bit