template and added new classes

template and added new classes