Database 95% working!