category refactor, prepopulate fields