Command Parser nearly finished