This will be continued in #197 and #196.