*TEMPORARY* refactoring gist
Merge branch 'feature/refactoring-gist'