Much more object oriented now.
homework
Merge branch 'master' of github.com:niive12/CupCollector