#16 some more progress