Fresh start

@tkurki if you agree, let's pull this and then you can pull and fork from `master` straight away