added comments to indicate where hackathon change is
Started implementation of Observer to help new starter Damian