Pull in thor stuff and add strainer