Second round of Commits, adding code already done.