ability to add sets draft
try optimize the queries a bit