Continued implementing clue code functionality