starting to impl more lean code and imporved user handling