#13 mostly done, considering error page