Full planning integration into master

Knowledgebase phase of project is complete!
Similarly, spread this out into multiple lines