Created api for scms server

This negates the need for double termination if watch and server are
specified