Refactor type form
Allow custom querying in a type list
Oh my god, it works
Merge and repair
Merge and maybe break something