fixed Energy refactor, still work to be done