Still working on fixing Bugs in Assignment2