Removed CS code
More moving around

Now new code is compling