Refactor in progress

Coming back April 2024