Block now working for non node types, little bit of shuffling