Got things a bit closer, unable to update the actual peices though.