This should port line numbers and filename patching