prototype of restructure.
pretty much final structure.