More work done on #6