lots of changes, making progress