@ornellasm and @sdevani

still have lots of work to do...two classes and several methods in each class