Removed the arbitrary restrictions on Shape matrices. Shapes can now be constructed from any matrix. Relevent testing updated.