Moved static stuff back in, db changes