my changes
a merge
fuck ya db stuff