:+1: Looks good, but better to move this class out of this file.