Initial push of category overhaul (DB + CODE) changes