Initial stub work on #46