Update 2 to use a new block/bucket framework. Updated setup.php, textblock, handlers, buckets, etc.