Reorganized a bit, cleaned up variables.
Resolving Conflicts