Some small refactoring and bugfixing
updating server side
Analysis now working
Currently we have a problem with SYNC therefore everything looks buggy
Work in progress