Add self as argument
WIP
WIP