Resolved Conflicts. Still has runtime issues

Needs to fix all runtime issues before continuing.