feat: refactor and new features (in progress)