massive refactor
db fix
seeing if this works
seeing if this works
seeing if this works
seeing if this works
seeing if this works
seeing if this works
seeing if this works
seeing if this works
seeing if this works
seeing if this works
seeing if this works
seeing if this works
seeing if this works
seeing if this works
seeing if this works
seeing if this works
seeing if this works
seeing if this works