updating class name
returned to project; cleaning code a little
premerge commit
premerge commit2