Refactor out, add util for backend
Fix up/down