Start work on random generation + tests Daneel.