Merge pull request #1 from MadPC/master

More progress, confighandler is just basic instructions.