Started adding notification system
Major changes