More WIP bucket type work