Full planning integration into master

Knowledgebase phase of project is complete!
Is this still a TODO?