Begining of full flex refactoring
A few more changes in this way. All strings puts and set are workinng