First pass at tax rewrite, still a long ways to go. #1744