working on commandline
Solved and merged conflicts.