added a bunch
commit for merge