First steps of #71 implemented