Cleaning up the model branch - Removing unrelated interfaces, and attaching an observer to the stock in Main