This needs a more descriptive name. Otherwise, looks good, will merge soon.