Merging Intuit changes back into brettweavnet before moving the entire repo to get rid of fork.