Full planning integration into master

Knowledgebase phase of project is complete!
Indeed, it is not. Resolved.