Tidied up build, got it compiling, working on EMR invocation