wip
some cleanup, testing refactor of pickers