Started work on values and contexts