Re-add Protocol Loading

Waterpicker <Waterpicker@rocketmail.com>
Manually merge #570

This should already be here, but got removed by accident in merge