Re-organizing how bubble profiles are calculated, with more inheritance...