Add DZ Epoch Version

Also testing rebase