Progress on #24