fixing list issue
adding more stuff
mergin conflict
working stuff
Merge branch 'refg'