WIP: refctor view