[WIP] Adds cap completition