Updates needed to finish conversion.
Reimplementation ready for testing.