Keionne's and my commit together (it seems)
Conflict Resolution
merging