Better internal docs
Working up formats