basic redesign done and compiles, now to fix a million stubs