Working on answer key implementation