Much closer to functional. Tests still failing.