All shapes stored as per Lab2 spec (center based)