Max's Pull Request

This code barely works.