Some progress, still not functional