lots of changes, more to come