started error checking
merge