lots more changes, still very much in flux