Initial setup for refactor