Added notifications to the PW app plus some code refactoring

Don't think we need this since it's already in ..