Removed unused code
Refactor of DataChangedEvent
Basic implementation of "number of cups"