Messy commit. I didn't really do as many commit as I should
Adds Lifters, Drafts Matchers