Add gems for better error reporting
Add some boilerplate and merge conflicts