Work on Fixing the Code after the Merge. Still some issues.