Semi-working version.
Names fixed.