Fix: refactor how we output
Fix: wrong namespaces - doh!