Hooray for getting rid of so much code!