Beginings of integration.
Memory errors left and right. Unimplememted features. Good god...
More debugging
Solved magic number issue.
Merge branch 'ms1-integration' into development