Progress made on #6