Mostly working on new documentation format