Initial commit with working version