Class support// needs to be combined with own