Finally comitting figures for functional views
Fixing the history to use references