working on Surreal stuff
Workin on it
And merged with jack
Merge remote-tracking branch 'jack/master'