Incorporating benching modulo structure to main package. Broken commit but need to change computer.