Complete CGI/HTML implementation

This pull is to track the CGI/HTML progress towards full compatibility