Added code to Structure, including definition of StructureType plus some changes to Draw and the constructor