Got us compiling after integrating JT's code