Completely fogot to test for nested conditions so do now as they are broken.