Started work on updating functionality