Finished new block handling, still need to add PubSub