Refactor to separate out WMF handling
Initial work on list classification (#6)