Revert "Revert "Microsoft Hackathon""

This reverts commit b979bea58ca79c233396ba00ee793db4703b31f2.