Changes to try to get everything working for the lower house, not quite right yet