Factored the units out into a separate object.