Back to old version, without huge node class
Full back
Draft finish with block's tests and brackets