removed comment code. add todo for logging purposes
add class