First Commit with the whole stuff