More progress towards working version.