javacc file compiles, now just doing some cleaning
resolved conflicts for now. code needs to be cleaned. some java files still need to be created