The beginning of a HUGE refactor!
Merge remote-tracking branch 'origin/dev' into dev