Initial work - add and sort functionality