refactor
combine effects
merge database calls