#4 Merge refactoring

Merged
RemixDev merged 20 commits from refactoring into main 4 months ago