lets merge the big feature that we wanted