Huge Update

First High Fidelity Test Version