Changed up grammar a bit, finalized some parsing.