Add html model - get tests passing in intermediate state