simplify
remove the unionization stuff for now
tweak naming convention