Init
Did some minor changes.
Major additions, including first module.
Merge origin/master