Feature taxintegration ds

Note: Also cleaned up some of the old rbkeys