Some category work. Not happy with it yet.