Clean up
Added soft and hard stop capability