Issue 2

I think this addresses all of the issues