still not passing the test but improved - passing back as got stuck fixing stuff again