Moar Work on CGI