WIP: Added some more generated figures