more no qui
80 port
some refactoring and more
some refactoring and more++