Basically done, playwright needs a tiny bit of work