First pass at new signature.