cleaned up conway refactor and tests