Added some additional comments, noting future changes required.