Lots of design fixes
Saved lots
More fixes
Fixed data structure