refactor: redo original code system now that we have the button