Refactoring + Block class

Possible to start writing SSmode