started compute refactoring
Merge pull request #600 from georgebyelas/master

started compute refactoring