Methods updated and intial draft completed