Up in the air!
Continue huge refactor
Compiling again after huge refactor
Fixes after epic refactor
Sync
Sync
Sync
Sync
Resolve conflicts
Sync
Sync
Merge branch 'refs/heads/OwnershipRefactor'