rewrite

I have apparently been going about this all the wrong way. Perfect
thing to find out in final hours.