add configpath
set configpath
wip upload to github
resolve conflicts
resolve conflicts