Added functionality up to the Closing page, but not much on that one