851

closes #851
@michaelDpierce and @duffcodester, this is the important spot