Do the 2 "todo" comments need to be addressed before merging this?