added a class
fixed imports