Added some classes and starts to methods