Initial commit with working code