committing changes that have been here for a while...honestly, not even sure what they are bc they've
been sitting around got for so long :)