First cut

Has full instrumentation