Massive refactor in progress
Massive refactor in progress
removed protocol provider stuff