Updated src from mars

More reformatting and results analysis
Might be using up more memory than in the previous commit