Kf 38

@nstraub I have an angular question before we merge