First check-in of working version.