12am weds 10/8 commit. Interface mostly OK; relationships still need to be established.