Working on security and capabilities, not finished yet