Got things back in a somewhat working state