Another WIP monster commit

There's issues with arguments being passed to figures