Full planning integration into master

Knowledgebase phase of project is complete!
They were at some point, not anymore. Resolved.