Working on rewriting all block classes