Going to try to merge my most recent changes with Joe's changes
Merged master fixed conflict