Full planning integration into master

Knowledgebase phase of project is complete!
Fix the indention here