lots more changes, getting there...