moar database shit
merged