work on command parsing