moved stuff and some new ideas to commandline