Moved to separate file, started making it 'modular'