Done. Tests pass and working in real life