Some MAJOR changes to the design.