Continuing to work on the serve command