despite the mess in my mind, let's commit some changes