Added class, bsp init, partly