Refactored everything…..