Better usage of db stuff, should work great... hopefully...