pare down, tests working