WIP -- Branch containing commit history

### DO NOT MERGE

This branch contains changes we had initially made to master, but needed to push aside so that we could update the fork.