About to pull
Merged with Tony, pulling to get Tim's Design Doc definitions
Fixed conflicts
ALL DONE MOTHA FUCKAS!
Fixed merge conflicts