Merging some tax functionality...