updates to layer2 functionality. Probably 50% complete. Does not compile at this point.