midway through cleaning this up. I have to go to dinner so a commit