Initial code review

Pseudo-PR to allow comments
is this actually used?