Merge pull request #1 from vikinghug/development

include function
WIP Design
Updating settings design