refactor godwrath
Merge branch 'refactor_godwrath'