begin implementing goping service
fixed merge conflicts