Initial commit for linear-time branch