some refactor work during lunchbreak
lots of refactoring and first implementation of piechart