added some change focus stuff. not quite right yet