Build-out of remaining functionality for 0.0.1