Feature/externals v5

Thought this would be easier at this stage