Refactoring

Most refactoring is done, but still need to:
-update mass balance eqn
-execute and debug