reorg stuff ready to try out seneca implementation