Make tests all green, now the real work begins