Started auditing and completing thin wrappers.