Still a mess but now we pass our 2 step tests :-)