Code Review PR

This is weird OO.