Completed dictionary. Closes #23