added assignment 4, plus updated main