Rework notify and add building notifications