Made some structural additions to Sprint-1.