Some neat stuff with error checking
Merge