Changed a ton of code and tests trying to figure things out, there is a lot of code here that now needs to be removed and cleaned up.  That will come next.