Easing work in progress
Refactoring various areas