Could someone look this over for errors and merge it?