More WIP Code

Still need to update more Protocols...
Fixed up indentations in some of the source code... i.e was mixed some
code was spaces / some was tabs