Basic functionality almost working again.