Working prototype
Preparing for distribution
Merge with upstream repo the first time