I'm fine either way, just want to make sure this warrants a separate class.