Initial basic commit with legacy behavior