Added Queen and King also added error checking