Pierce dev

Last merge did not include all commits for some reason, deleted and recreated pierce-dev on github, going to try merging again.