Second commit(now includes third and fourth)

Third commit

Fourth commit
Resolving conflicts