dynamically populated categories and fixed randomizer
Merged Joeys branch