merged both prototypes togeather into a single repo