Max pull request

This is tricky but fun! I still have work to do on this.