Issue 3

closes #3 though there's likely more work to be done here in the long haul