Renaming
Slight changes
Added a Category class