oh god last commit was weird