refactor for new sig pattern done, mostly working again