Progress on making it actually work