More work towards first version.