let's start cleaning this up