all tests passing -going a different direction to get around pick draft problem