Started work on code completion