whew! a whole lotta changes - mostly tho, started making components taking out of the layouts