finish hybrid energy and solver, test tomorrow