trying to merge joe's changes to my forked repo