added more keys, linker error in last 2 commits?