ideally yeah, once facade is refactored