all legacy stuff done - may need some cleaning