Functioning  method bodies now. Time to write a bunch of test