Some more chnages. Need to get the JS hammered out.