A whole bunch of stuff

Wait untiul max finishes his pull request before doing this!