A whole lotta changes - fuller description to follow with PR