Added statement parsing; Reviewed part 1 again with Nick A