finished almost everything
fixed merge conflicts (kevin)