final commit before mucking around a bunch