Merge all functionality into public repo