Move the separate files
Listen for event instead?