Workunit split

@jakesmith can you check/comment on this?