Adding Units Works, CLI needs to be stabilized