picking targets working
Fixed merging conflicts, all tests passing