added nonbonded calculations, unit test still fails
added nonbonded calculations, unit test still fails