Running two lambda simulation
Cleaning up TODO's
Reorganization