Started working on command parsing