Huge code re-org, added code to support the 2d universe in conjunction with the simulation