WIP to reset
Finish up category picker
Finish up category picker