wip
wip
Added block descriptor
cleanups