Started filling in functions for Assignment 2