First Commit

This is code used from the Open Source branch by Anirudh Bhat