Lots of changes ; especially start reworking expression system