New branch that tackles the size issue and stores far fewer keys