Adding stopping (18/24)

Adding stopping