finish shoring up client module and specs