messing around
merged my stuff with bens