Started adding protocol....
Cleaned up / removed extraneous references.