Initial commit with control