Adding messaging and observer pattern in a couple places