Refactoring to Remix...