Adding more commands, refactoring, more work with threads