new class

@matthiaszarzecki please merge into master