first commit with changes for categories locations and etc.