Additional Structure

Not working yet, but structure is in place. Need to fix all the bugs
now and add additional portions.
Additional Changes