big changes, lots of work to get things working