start on code updates to match new spec