Compiled code with majority of refactored inner loop. need to test on ubuntu machine with test harness
Merged conflict
Code compiles