Initial commit---fully working version