Have completed a first version!

To look at further tomorrow to see if we can decrease amount of code
lines.