Once we merge I am going to reformat this class according to the coding guide lines.