complete rewrite of code, to make everthing look cleaner
fix attempt CLI
CLI fix+Server fix