WIP
Stupid arity bug
WIP
WIP