Let's keep it in a separate class for now to see if it makes sense after changing weighting functions.