Adding some toggle serve (not finished)