Trying some more bitcoin client reworking