Review

Signed-off-by: Spencer T. Parkin <spencer.parkin@gmail.com>
do the todos