Replaced bad file from earlier merge conflict with Eric's version directly, with a few minor changes iwth imports at the top
Compile changes