last working commit
decard interface clean up