refactor into map and set, stub out some junk