Shape class completed