Trying to add restart...not quite there yet...