Large Commit from Stryker
Merg with Origin
Updates to Dieseland Character