Breeze:  adding most modules back in