Almost done, need to add in lists