Everything works, time to compare to main branch to see which one is better