Formatting noise
Formatting noise
Formatting noise
Rest of swap file blockchain changes

Punting on the rest of this as we're not planning on merging anyway