Conversions: Adding multi-unit support (issue #318)

Hi Guys,

Most of the actual leg-work for this has been done by @elohmrow; we've extended and refactored the goodie to a large extent. 

It's not quite fully cleaned-up and ready to merge currently, but we'd welcome any-and-all feedback whilst we polish it up.