Finishing Merge

Forgot to sync before coding, had some merging issues. This resolved it.