Added more keys, still some to go.