Some changes. Working towards a first release.