WIP: Reduced code complexity