merging with hackyale master 9/20