New almost working, just has to fix datetime conversion for subcalls at storage save time.