New Version

Working version awaiting uploads from Toshi and Julian