Wrote test for making picks, some pick refactoring
Remove dead code, refactoring, more tests.