#1494

Would you mind making this a class?