Datatypes reorganized, basic parse rules added