fixes #5. fixes #6 Adding in the union