More civics/taxes interface work