Update TODO
Stopgap: reference derived data via $$
Make diamonds spec simpler for faster rendering
Update TODO