TODO updated for Space/Dimension classes