WIP: Reorganize method flow