External sources 889631

Needs a visual update from @darkwing