add some class names
simplify it for now
add polling