Added more conversions

This should be enough to start to write a full converter