3rd Commit. Conversions complete