First Commit Most Parts Working