Add back frisby and close #344