Fixup the code
Convert exercises
More conversions