add support for capAdd

@cjellick This is the same PR from a different branch @ibuildthecloud 
@ibuildthecloud --^