Collin branch

Merge my changes I guess?