started on command parser, some other changes