removed extraneous struct, I'm not sure how that got in there as it was an idea I had a few days ago that I hadn't revisited...