convinced Bill I needed to rewrite most of our code. Not sure how he'll react when I tell him we only need to change like two things