test
Almost done! We did a lot in this commit because we haven't been able to push in a while. Fixes #62, fixes #52, fixes #51, fixes #50, fixes #47, fixes #46