first working prototype
merging