Major updates to Project2.