Should this class be moved somewhere else perhaps?