Add all the remaining tests and code to get the site functional