Is there anything else that needs to be addressed? Would love to merge that code once the remaining dependencies (Review 110607, Review 110608) are commented on and commited.