Improve serve so we can start and stop the server easily