fixing merge
added class functionality doc