Cleaning up some commits… trying to anyways