Progress

Mostly database stuff