Closes #112 - Preferred units