add back in the commented stuff, as parser works now