More progress on initial version