first stab at finishing the conversion