Only small changes

Beginning to implement the methods covered in our last meeting