Picker 101

Big refactor