Second commit: added categories, authorization