Removed some hardcoded stuff, and stuff not necessary for this application
Merge branch 'adding-planes'