Multiple sources

Pushing straight to master without testing ftw