Merging

Merged Josh branch with Esau's latest commit