trying to merge from another site, still funky