First Commit

Several months of changes