Adding basics for expessiv controlling

and some other changes