added empty ultimate functionality
merge
error message divs added
merge
merged matt's changes