Merged changes from messing branch

Added + tested sger