commiting the ages (old stuff)
merged