We can do better than just throw an error
Merge branch 'care-about-arguments'