Preview upcoming refactored code

Preview upcoming refactored code & improved functionality