Rolled back some changes as they won't be part of Assignment 2