Mostly working. Need minor fixes (at least for simple).