Did some work on decoupling Link, Format