Started adding support for US Units. No testing performed.
Completed US Unit addition