Working cut of review with first test. Need to work out better ways of testing.