Power-field calculation done, some refactoring, lots more left to do