Should this live in a separate file?