Added some extra stops and a stop method
Added a missing file