More internal restructuring...all the internally used fields should be properly hid now.