Git conversion of main bazaar lyntin code