Changed ALL computation classes to modules (don't need instances of them..?)