Added basic functionality for assignment 2