finished threading the modifier parser through everything; compiles, but doesn't yet work