Working on adding keywords