lots of structural changes, still rough drafting