added delete and edit icons...bitch
merge with the river
merge with..someone