Add TODO notes
Fix issues in implementation of conversions