First commit of SS-System 2.0