Full planning integration into master

Knowledgebase phase of project is complete!
This if statement should probably be spread out into several lines.