Set refactor, to use ajgenesis/models, WIP