Added comments + basic notification structure