REset
Merge branch 'brian_navid'

It just is