Part of #32 and #33