merge names
do names properly
comment out things that work