Finished base version of dictionary