Working on code completion