CORE: Remove hardwiring of output (compiles fine, calculation logic has to be solved)