Separate update into subclass
Building cocks yo.
Finish up builder and spec