initial calculation controller - potential reduction + Test
Merge remote-tracking branch 'origin/master'