Added methods to classes and calls to script

Need to move the script calls inside the methods to make minimal script
calls.

Need to add reporting structure.