Updates to clustering work
Updates to prediction work