Update Attribute type check added. NOT COMPILED - commented out until able to make. Not finished, under construction.