added klass functionality
merging conflicts