Resurrection. Big feature patch!