more changes.... not working correctly yet. Losing classes...