Added agg and notif
Merge branch 'msipf' of github.com:yeleman/snisi into msipf