Re-did database, updated user model and created working user spec