Hopefully converted the last of the js to c-sharp
Merged everything. No more js.