Update to use User model, autoset user field based on logged in user