lots of reorganization and design work