updated order joins
updated w/ working files
Parser changes