refactoring
refactoring data structure
bugfixes
new Code on Service
state added to service