Issue 20

[category] Separate categories #20

Obs: notification system not yet integrated.