Get rid of BlockItem - do it another hacky way for now, solve this problem of multiple item types later Fix