It's done but it hangs - I'll debug tomorrow.