rearranged some data structures
picker FBO sort of works