More Waffle.IO stuff

backlog and done may not work