Classes in pretty good shape. Need tweaking. Test file working