working to get launchable version ready
merging