WIP: refactor for partial view use