Huge refactor
Merge remote-tracking branch 'origin/refactor/whole-application' into develop