WIP: refactor: almost everything passing cept query params